From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 17 Aug 2017 12:45:14 +0000 (+0200)
Subject: x86/asm: add .file directives
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1662
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c39cf093fc7de5eb3c8bc2bee0cd3078d4049947;p=xen.git

x86/asm: add .file directives

Make sure local symbols are correctly associated with their source
files: I've just run across a cpufreq.c#create_bounce_frame stack trace
entry. Since we have multiple entry.S, don't use __FILE__ there to
fully disambiguate things.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S
index 7228637823..361751d290 100644
--- a/xen/arch/x86/acpi/wakeup_prot.S
+++ b/xen/arch/x86/acpi/wakeup_prot.S
@@ -1,3 +1,4 @@
+        .file __FILE__
         .text
 
 #include <xen/multiboot.h>
diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S
index 959c8212bf..243a7679c8 100644
--- a/xen/arch/x86/clear_page.S
+++ b/xen/arch/x86/clear_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define ptr_reg %rdi
diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S
index f925a39f2c..2da81126c5 100644
--- a/xen/arch/x86/copy_page.S
+++ b/xen/arch/x86/copy_page.S
@@ -1,3 +1,5 @@
+        .file __FILE__
+
 #include <asm/page.h>
 
 #define src_reg %rsi
diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S
index a4ab40af2a..4a72e38e8b 100644
--- a/xen/arch/x86/hvm/svm/entry.S
+++ b/xen/arch/x86/hvm/svm/entry.S
@@ -17,6 +17,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "svm/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S
index 9f1755b31c..53eedc6363 100644
--- a/xen/arch/x86/hvm/vmx/entry.S
+++ b/xen/arch/x86/hvm/vmx/entry.S
@@ -16,6 +16,8 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
+        .file "vmx/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S
index 217812b44f..6d26192c2c 100644
--- a/xen/arch/x86/pv/gpr_switch.S
+++ b/xen/arch/x86/pv/gpr_switch.S
@@ -5,6 +5,8 @@
  * Copyright (c) 2006, Novell, Inc.
  */
 
+        .file __FILE__
+
 #include <asm/asm_defns.h>
 
 ENTRY(host_to_guest_gpr_switch)
diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S
index 90bda09614..ba6e941837 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -2,6 +2,8 @@
  * Compatibility hypercall routines.
  */
 
+        .file "x86_64/compat/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index b6e2397e84..6066ed8b18 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -4,6 +4,8 @@
  * Copyright (c) 2005, K A Fraser
  */
 
+        .file "x86_64/entry.S"
+
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/x86_64/kexec_reloc.S b/xen/arch/x86/x86_64/kexec_reloc.S
index 0b1f9a028d..4d527dbfce 100644
--- a/xen/arch/x86/x86_64/kexec_reloc.S
+++ b/xen/arch/x86/x86_64/kexec_reloc.S
@@ -10,6 +10,9 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
+
+        .file __FILE__
+
 #include <xen/kimage.h>
 
 #include <asm/asm_defns.h>